merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 2 Aug 2011 00:37:05 +0000 (09:37 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 2 Aug 2011 00:37:05 +0000 (09:37 +0900)

Trivial merge